It would be great if the cpython sha1 in .travis.yml gets updated too

Not for editing .travis, it can be done at the end.

TODO:

• git -C ../cpython rev-parse --short HEAD
• sed .travis.yml

And while you're at it, but it's more complicated, you can name the branch with the sha1 from cpython instead of the sha1 from python-docs-fr (so you'll have to create the branch after merging (you're not garanteed to have cpython before merging))

Here's my idea of the flow of this script on a server. It will be hosted on a small thingy somewhere, executed by a cron job.

Cron job:

• rm /tmp/python-docs-fr && git clone https://github.com/USERTHATWILLDOTHEPR/python-docs-fr /tmp/python-docs-fr && cd /tmp/python-docs-fr && bash make-merge.sh

The script will:

• Clone latest cpython in /tmp/cpython
• get the latest commit from cpython git -C ../cpython rev-parse --short HEAD
• Create a new branch named upstream-merge-$(CPYTHON_SHA) and checkout the branch
• Sed .travis.yml old sha to new $(CPYTHON_SHA)
• run make merge
• install pyhub-pr
• commit and push changes to fork
• create PR

So apart of make merge, nothing versionned here? Works for me.

Well .travis.yml and the files from make merge will be modified and committed

yep I meant the cron script

Well the cron script will be on a server somewhere, and won't change, this is why the process is on this file on the repository that will be cloned

👍